From: Alan Mackenzie Date: Wed, 18 Jan 2012 11:50:27 +0000 (+0000) Subject: Merge from trunk. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~2326^2~3390^2~16 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e8afb1265f8067d360f03c514603223cde92ffeb;p=emacs.git Merge from trunk. --- e8afb1265f8067d360f03c514603223cde92ffeb